Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 04:18:47 +0000 (21:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 04:18:47 +0000 (21:18 -0700)

Trivial merge